From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 22 Jun 2011 18:18:38 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~1163^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d231e1987e31c9481489ee90db89b7b055ab3fb9;p=emacs.git

Merge from trunk.
---

d231e1987e31c9481489ee90db89b7b055ab3fb9